Revert "fix #1, #2, #3, #4, #5, #6 issues"

This reverts commit e61311c47c2f5e487884b5b4354ff6769ac726ac.