finally done tweaking uploads...I think