Substancial build improvements