Fixing watch for scope mode, minor syntex fixes