minor changes and comment in response to Ole's comment.