Misc fixes
Tidied app code for upload progress
Comment++