last commit to this branch for a while

proceeding to dev-evalknieval-node branch