some refinements for launch