Crude fix to recurring del/com + undo bugs
Attempt to reduce runtime