Output, score correctness tweaks