Formatting and slight npc rework.