More minor changes and comments