I will report on a study of the electroweak phase transition in the 2 Higgs doublet model in the light of recent LHC results. In a second part I will discuss numerical simulations of a thermal first-order phase transition and the resulting production of gravitational waves.