Fix some bugs & Update README