Added more NPC stuff