More inline comments for completeness