Undo seems to be working better...  Committing now before I make another attempt at undo/redo...