Small improvements and fixes
Got rid of HTML word lists