Upload of pictures finished with some other fixes