Finalize Combat analysis, do minor style changes.
Add observers and change cheapest unit handling.