admintool refactor upload 12: add comments