r10227: updates from phoview@lynx