more changes to CLI