Changes on 6/12

Bugfixes