Fixes for a new cms. A couple of bugs still associated.

Has some issues with redefining molecule types.  Solution is
to give each molecule type a unique name.

Might also have issues with quotation mark strings.  Solution may to
be to replace with underscores.