Updated with further improvements, inc dropbox and missing required packages