Fix for cyrillic characters and some housekeeping