More tweaks to make both ranking methods look good.