more minor changes, etc