Some slight changes to scoring. This is equally broken :-(