fix a lot of Builder bugginess