Some bug fixes

Fix some small bugs
Revert "Update README.md"

This reverts commit 9289b193e4df67aada6625c8797b786930974eaf.