Minor improvements to words