Rent calculations are refined and improved