bug fixes and nested watching