Spruce up section 2
Tweak section 2 wrapping