Latest changes

Also prepping for node support