Add ranking, tweak matches