Continued building up the TSP solver. Some changes.