Some header checking
updates
Updates