Clarifies and removes scoring variables; closes #27