basic watch functionality and fix args