lots of cleanup, uploads are solid