change some line number  code and fix some header errors