fix, simplify and cleanup the build tooling.