Fixed up to section 2 plus some more