Import from dropbox
Import from dropbox
misc fixes