some more minor changes...