Fixed scoring
cleaned up a little