nodes now carry better info