Accounted for unplaceable locations
Fixed unplaceable bugs
Tested most of combat
Finished Combat and tested