final fixes + remove restart app after start