wordcloud fixed, other fixes