Misc. improved editing