Revert "tweaks"

This reverts commit 78f182000b35f4623e0023b91ba53e3689b217d3.
reverted due to bad commit
manual fixed commit issues