bugfixes
Revert "bugfixes"

This reverts commit c16242adbec05fff085e6e36371f4fba80cc7165.