Various changes.  Bad commit message.