fix and cleanup for highscores