Addressed some more Ole's comments.