Multi-edit broken in some cases+issues