Ready for demo

Bug fixed and quick tested chapter 1