General revision, no major changes.