Revised chapter 04 and appendix A