Important changes to rawDataUpload.py and rawDataUploader.py, plus misc