Added sup and super links.
Simplifies naming for top level molecule.
Merge with master

Resolved conflicts and merged with master