Uploader

Some fixes we talked about.