Cleaned up some code in BuildingManager and worked on improving the 'build' functionality