fixed a few issues with score assignment
Merge commit 'be7a7a0db975bd9073b5497c05304d0ad2ebe1d4'
Finished!! with comments added.. works