EDITING: do not ask for draft extras

Also includes #384