Revert "small fixes 2nd try"

This reverts commit 4483669056395df12e5a5399b84fb725b89d856c.