tweaks to word-count