Cleaning up basenode
Bugfixes