minor improvements to basic watch_lib