Minor Changes ... Bug Found in addWatch, TriggerWatch