Revert "little issues fixed"

This reverts commit f25b640f80c9e29c66364c415be5f3614ed09a67.