fixes to cli