improvements in cli