Revert "minor bugs"

This reverts commit 31e78020bde80f8551e05a7a8c3910995be9b74c.