Add chapter 3 of mix
Fixed bugs in chapter 2 of mix