feat(uploads polish): fixed minor issues refactors etc