Tweaked excludes and modified the include oreder a little.