All stub drafts done; slight changes throughout