Add support for rank list plus minor changes here and there