initial fixes on chap3b