Small quality updates + logic update in class Scores