Parity with old version, plus scoring/sorting, and settings