comments & small changes (node() vs *)