I think this fixes most of Section 4.