a few more minor changes