bug fixes in nodes classes