Reworked to include corrections up to section 2.4 Matchers