Changed node highlighting, tweaks