Rearrange ranks a bit and fix unleader bug