Bugfixes, work on NHunspell support