Preparing to add uploads, scattered bug fixes