Update build, tidy up