TSP problem overhaul