some more minor changes....