editinplace improvements