fixes and cleanup and new node types