* various upload/selection changes