Add some comments on tricky sections as suggested by @before