Minor updates to npcs and npc interaction