New build with fixes and style changes