small fixes in ch7