some changes in keynodes; some work on issue #51