common optimications and cli changes
upload