Resolving other uploading problems and minor errors.