Even more tweaks and revisions.