FIX: somehow button is not set
FIX: strip out some more undo/redo stuff
FIX: extra safety