Add upload to Dropbox and some fixes