Added more header support, fixed multiple header bugs