fixes in ch7

- small fixes from email