some more minor changes