some fixes
Revert "some fixes"

This reverts commit f77909d0aaf5846881eed0cf018946e15465b7bb.
some small fixes
Merge branch 'develop'