Added support for non-topical words
Cleaned out old code. Reworked hyperparameter resampling