Adding leaderboard and fixing some bugs