cleaned up some classes and did an initial check for the header