Minor bug fixes.
Merged in changes and content from the article.