Fixes for nodehighlighting

Closes #11
Closes #23
Closes #29