Update for v1.x releases

This should do, please excuse my JS :-)

I left a couple of things undone, check the TODO.