Did a lot of cleanup

Next task will be to implement the FoundWord Collection and override the
Add function to avoid multi intersect problems.