lots of changes for new dat/sol nodes to work