Finishing section 2, and fixing minor things