made a couple of changes to base and node classes