Fix some bugs. rollback error and lose some commits. Thanks to splade's fork of my repository, I can find back my commits.