Lots more Entity and NPC fixes.