improved uniform uploading. minor other changes