Made some more minor changes.