Updates for GDrive

I had to merge instead of rebase, due to the several conflicts found.