more changes to cli