Bugfixes and more node types