some bug fixes
Merge branch 'watching' of github.com:plohoi-chelovek/zhanna into watching