Various changes to the NPC stat block and fixes