some fixes into chap 3