Augmented undo and added help