Made fixes to how files are uploaded, and set bucket keys to the correct keys