removed some crap
Solver tidied a bit, still not brilliant.  Also it has a bug, it doesn't estimate the greedy max properly