Fix some bug and edit the README