better drafts, minor fixes