NPCs fixes, updates and aditions