Store swap, backup, and undo away from working dirs
Some plugin changes