minor changes in a few places