More minor modifications.