Bug fixes, new build script