gpx improvements
Approaching the demo