Bunch of cleanup. Ran pretty well, no worse than last commit and maybe bit better. Got as far as and