bugfixes
Just before presentation