CLI options tweaked