Found a few new optimisations, which mostly worked in this run. Shame about the all easy stuff I messed up.
