Looked over the 7.1 and 7.2 sections. Still needs to be looked at and changed according to Aslak's comments.