Less undo
Fixes for i3