header changes, cleaned up crap