With the surfing, just change it so it spawns you right at the surfboard you last used. That helps cut out 2-3 seconds of walking time - very useful!
Done.
