Some work on build script