scoring is fixed, but still a bit wonky
Merge branch 'local'