fix header overlap issue. closes #48. closes #35