Some small bug fixes in the runner related to optimize flag.
Some tweaks to fix orthogonal heuristic and it seems to work okay now, but could certainly use some tweaking...