bug fixes to basic watch