Updates

I gave up halfway trying to convert generator.js. I'm sure you can finish the rest ;)