I just noticed you've added in the number of buildings.  I think I suggested this a while ago and am SO pleased it's added in.  Thank you, thank you, thank you!