add fixes and content to cli-tools