added lots of manus cleanup stuff
uberprepare uploads files now