improve stability. Resolves bug report <https://bugs.openfoam.org/view.php?id=2544>
and two-phase functionality separated from multiphase functionality