Finished Data Table and Uploader Fixes