various changes, nodes mostly done