More watch trans changes
More watch_address stuff