some cleanup on uploads, and changes to UI