Try to fix scorer, still buggy
Add comments