Add new command line options for clustering and role

I like `combined` better too.