added scoring methods
Merge with Dans updated fileset.