Still fixing the upload of things that weren't required and other general cleaning up