Added support for comments and linkable subheaders