Some bug fixes. BestTour needs to be fixed.