some more minor changes.