Separate and articulate scoring rules; fixes #23