fixed some header file stuff
cleanup