GPS connection in Apnea Hunt Mode

I mostly use the MK1 when spearfishing and I would like to know how you freedivers and spearfishers gets as much GPS tracking as possible.
I mean when I return to shore and gets out of the water, I normally only have 2 GPS points: the start- and the endpoint of the trip.

My questions are:
1) Have you changed any GPS-settings for the Apnea activity to get the fastest possible GPS-connection?
2) Do you lift your arm sometimes during surface-time to get some GPS tracking or do you manually save the location(GPS connection is still needed)?