Made changes to s5 and previous sections a bit.