moving some header stuff around and cleaning up some comments