Improved some copyedit interaction