new build fixing minor bugs