command line fixes + CM viewer