Add comment to help me remember how to draw shapes around stuff in tikz
Read through, fix minors, and add TODOs where appropriate