fixed up some nomenclature

comments, some alignment, descriptions