Added uploading class, minor fixes