uploader + various tweaks