New build -- lots of small improvements