Major dropbox improvements