fixes, and an uploader