bug fixes and dropbox commit 1