Have 2-opt/3-opt/greedy keep track of tour length.

Also fix some bugs.