Sat Jul 14 17:22:28 EDT 2007 geoff
    the patch is incorrect, but i've taken the opportunity to
    make a correct fix and flesh out a few of the messages.