added terms to chapter 2
Merge branch 'terms_revamp'