Simple recursive edit and some tweaks