chapter 4 really done

... not really but mostly :)
chapter 5 done
chapter 6 fixes and add todo