NPC overhaul part 2 and some mapping.