Added support for 'non-topical' words
Minor updates