New box build & minor fixes.