fix the way we parse the Node; add some more logging