Improved NPCs and dialog