node updates, sync with Augustins branch