+Fixed scoring issues