fixes to launch file, also updates to CMakelists