minor style, other changes