fix some bugs
Merge branch 'for-sergei' of https://github.com/skrauchenia/borsch into for-sergei