Improvements to FillCommand

Replace and Undo