Harlo bug 2746

Also with some cleanup and Google Drive Transport