header fix and some changes to header