Significantly edited the entity grid and tsp sections of the paper.