Merged in Undercova/holocore (pull request #178) NPC updates