Unified upload callback & tweaked localsystem