Smarter suffix matching
No suffix for stopwords
Added TODO