branch parameters and launch files update
minor changes into params and time scales