Fixed undo + misc