new build with some bug fixes