fixed more errors
Merge branches 'upload' and 'master'