A few minor changes to bring the code up to date with the article.

I forgot to push some of the changes. Here they are :)