Patching main editing bugs (still crashing silently on every edit.