Better scoring mechanism, fixes #9