uploader skeleton & bug fix