Added the building classes.
Other small changes?