mv ch6 to ch7
ch8 8.4 minor
merge ch7 r