Updated classes and setting score

Fixes #67 and fixes #68