Tasks and tweaks to support drafts