More polish on uploader