updated the cli, fixed some bugs