Fixed some notation inconsistencies, more to be done in other sections