Added some clarifications and fixed the  polyfill