Last minute changes. More comments.