a little cleanup
added basic score functionality
Merge branch 'master' into gh-pages