NPC fixes/additions