Prepping editor enhancements