some improvements for the launch