added new build plus other fixes