Add syntax highlighting; add a bunch of notes; reorganize a bit