MORE fixes. Still getting used to mass code base.
MORE fixes. Still getting used to mass code base.

madrazo/nme,haxenme/nme,madrazo/nme,thomasuster/NME,haxenme/nme,madrazo/nme,haxenme/nme,thomasuster/NME,thomasuster/NME,haxenme/nme,thomasuster/NME,thomasuster/NME,haxenme/nme,madrazo/nme,madrazo/nme,thomasuster/NME,madrazo/nme