Upload files testing & improvements

I'm so happy you did it :)