Intro tweaks, more forms.

Forms is getting long. May have to break it into two chapters.