small updates
ch2 done
Merge branch 'Ch2'