use undo tree again, minor improvements