Uploader improved and fixed;