Fixed several bugs in uploading

Need to fix color choice code