Improve graph, fix polyfill loading