lots of little updates...see TODO/DONE..also work more on npc target
stuff