Improved word-identifiation and separation.