small fixes: hyphen-separated words, abbreviations and 'i' treated as word, not roman