Several minor changes.