launch file change, minor cleaning