Adding some missing type params
Complete (but not great) implementation of TSP
Cleaned up paths; drawing still not working