small changes section 1 and 2

Removed the final part of section 1 as it should appear in Section 2.
Slightly started to rearrange the beginning of Section 2, but plan to
keep most of the structure the same.