Fixing a few minor bugs
Added work upload