Removed gf mapping in favour of gf-ext.
Other rearrangements, minor comments.
Minor comments for plugin configuration sections.
Minor comment additions to plugin config sections.