Fix a number of minor typos and inconsistencies

Thanks for this guide!  I used it just the other day and noticed a couple of minor mistakes, so here's a commit to fix them.

p.s. I looked around for your talk at N^2 but couldn't seem to find you :)