270 Fix wordcount bugs