Some fixes for word and whitespace.
Merge branch '1.x'