The scoring system all cleaned up and fixed. Closes Issue #2 though needs device testing confirmation.