Update draft. Still likely incorrect in multiple places, but should be correct "enough."