Merging master into deployment.

Includes updates the to score graph. Blunder fixes.