Several word wrapper fixes and improvements.