Finish notes for 2
Typeset 2.2
Typeset 2.3 (Fixes #2)