Updated build-flow, removed d3, minor changes