edits to building class and other similar classes