Actually managed to merge stuff. Added more effective 2-opt swapping (in theory).