Revert "fixed varios"

This reverts commit 6969c707fbc3019e4ef2f557ab68ea8f1868aa4d.