Your numbers seem correct. The number of rooms is irrelevant.
Are you truly renting the outside spaces or are they part of the package deal? If they are included in the rent paid, then do not include them. If they are stand-alone rentals, then you would include calculations for the space.
