languagemodel and dictionary path separated
code cleanup and random bugfixes