some fixes for Undo; add CallBackBean from Bean