Make TP Fix distance lower; Cleanup