Improve handling of rank
Improve handling of rank

JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer