Update options documentation and increase coverage on diagnose.