Various updates to tsp file