fixed uploading
fixed logging