cleared up a few things, including nomenclature difference
(#6)