Label and Scoring changes and more

@scottpurdy 
Here is the beast I told you about 
nit: 3 blank lines before