:DDDD Repaired all the NPC's up to the Battle Test

(Still needing some tweaks)