Syntax fix
CLI Tweaks