bugfixes and removal of unused node