better handling of hyphenated words and fixing all spces