fix stuff (sorta)
Merge branch 'uploadScrewingAround'

Get uploads working