Add leaderboard and fix issue