Simulating convection and lightning occurrence: improvements