minor cleanups
minor cleanups
split node-ness out of watchable-ness
some renaming