support excludes
fixes and improvements