Improve launcher script