reduced iterations in energy correction, and started support for friction