Refactors battle and adds fight section.
Adds some minor refactorings and configuration updates.