cleaned up comments, and fixed include/exclude logic