Added Google Drive support
Small fixes