Bunches of NPC changes.
Merge remote-tracking branch 'origin/Zargy'