a couple more minor changes