Updating cli behavior
Some tweaks