Rank fixes

Gets & sets the rank