Fixed cli_arg and enhanced cli_spin