Minor header file changes; update to functions.