cdodge/speed-up-get-current-position: enough said

more

cleanup