Dev012a

-Various fixes
-Added upload fields