Change version info
Fix some bugs