Improved watch to more than 1 watc points
Small change in error msg for watch