tidy-up on the controllers and small ammend to the upload script