Bug fixes and Header change