improvements to cli