fixed some header issues