Fixed scoring
Cleaning messy merge