completed nomenclature and other minor edits