Minor tweaks, undo ability.