Lb

Miscellaneous fixes for the header file.