Improve ranking; Fix some bugs
Update version number