More partial work and fixes

fix brackets, rearranged build list.