Lots of cleanup. Tabusearch fixing and 2opt too.