minor changes
more minor changes