Bug Fixes and leaderboard improvement