added autoUpload options, small fixes