Updated some comments, move polyfills to EOF