Changes to comments only.
Fix bug with handling excludes/includes.