Final revisions before v1