Fixed scoring bugs
Fixes #13
Fixes #14