more intelligent spam checking
Merge branch 'enhancements'