Corrected some of the inconsistencies between the header and the cpp files.