Work on Chapter3, fix bug in Chapter2