Final revisions with even better comments