Removing util/word
Varous minor enhancements