Added better comments and exclusion rules