Revert "fixed some small issues"

This reverts commit 96c6e732e52ecdfdc1c9ff969e60cba2c5e71940.