fixing some header issues