Improved commentary and links