updated all headers and added more exclusion rules