Polyfill promises
Minor tweaks