Implementation for Issues #1, #2, #7, #8

Document Uploader issues addressed