Fixed some issues
Changed upload