More work on node stuff and various fixes/tweaks