with editor improvements

Hello,

Wait a bit before merging please, it's not ready yet.