Revert "small bugs"

This reverts commit 35f817da0d54449ddaffda1a887a7bb187b8d822.
Revert "tmpt"

This reverts commit a436262b41a8c84c8ba47e9d9055624b957e6fe8.