Additional code cleanup
Basic leaderboard implementation
Merge branch 'thomas'