Minor undo fixes, undo done.