I've used Garmin BaseCamp as my repository for recorded tracks on a variety of Garmin GPS units, added Avenza Maps on my Samsung S8 tablet and with the Xpedition, Ride Command tracks. Using Basecamp,, I can trim wrong turns off the track, add waypoints, etc. Then Upload them to Avenza Maps...