proper order of editors and smaller tweaks