Fixed heuristical scoring (including diagonals!)