minor fix in launch file and a few fixes