#1 fixes, removed node array