New build

Bunch of small improvements