Building constuctor improvements

Also this

1 Like