Updates (and fixes) opa