[Section 2.2] Revisited, fixed errors, completed missing parts