More progress and optimisations on 2opt. Still too slow.