Major cleanup + gpx2xml