Improvements to leaderboard