Now Map is the object not MapPolyfill

And some bugs fixed