More fixes. works at very high (40%) loss