Additional changes. config, SW layer. Commonitems, and command line
options