Improvements

Here are some improvements for sections 1–2.4.