updates following comments from Eugene