improved scoring to stop memory error
Merge branch 'improved_scoring' into Version1.0