minor mods to header files.
Minor mods to libs.