bugfixes and more NPC code