#1 fixes, nodearray draft