more testing, reworking of config restore, rework of execution