two surface creation issue fixed
(but the updates of the DataManager now are applied when clicking Finished)