double loop
fixed double loop in launcher
fixed conflicts after merge
...