Hyphenated words now count as one word? plus some bugs that this has introduced

[zoran]

@TomErikSmith I hope we will push a fix for this on Monday. Appreciate your patience.