lots of cleanup in launch files, parameters