some build adjusts and more