Added some NPC stuff