fixing NaN error
addWatch now does not fire the callback immediately (which caused an error)