types+grammar: adding lots more content to chapter 1, finally