Many fixes. New dictionary and analyzer.