Fixes for header & code cleanup