Improve macros.
Add some comments to the article.