Add nomenclature.
Some minor fixes.