Added remove excludes, and other misc changes.