yet more minor changes