various fixes correcting typos, nomenclature, etc