ir, sonar revisions; watchmen disabled