Refactor scoring a bit, should resolve scoring issues