Add annotate, footnotes, and better errors