Minor corrections to ranking - not saving correctly in all cases