undo bugfixes