fixed issues in upload and some more
fixed merge conflicts