NPCs fixes, updates and aditions

It's correct.