Lots of changes to the word cloud and some changes elsewhere in the code as well