Work on bugs

Tanya + Volodya