Unity: Code changes, map highlighting changed, combat closer to testable