Make save uploads occur in seperate thread, and fix it