some improvements and bug fixes

I hate cp1251 !