More improvements to nod01