header and bug fix