Remainder of gpx lib added tour screen cleaned up