Update from Wohlstand's repo

NPC stuff