Revert "tweaks"

This reverts commit 35d2f0a6091d0c98ccfce5878d35b9f66d26dd80.
Revert "more from kumajaya"

This reverts commit 33b7ccf779f0182ae43270ba31e886a0377c0e1b.