Some fixes for word and whitespace.