River Race ranking improvements

Thanks — discussions are on this thread: