new build, other minor fixes