new nodes, minor bugfixes