made small changes to entropy residual and jump, no significant change in results