Updates and fixes to CLI