fixed --watch bug
fixed escape bug