Yet more tweaks and fixes to the draft

Yet more tweaks and fixes to the draft.