Listen to NPC spawns

Also various minor fixes