*NPC tweaks and fixes