OOP fixes, especially for score table.