Gm

Miscellaneous issues with the header file.