Update to r40946:

This patch addresses the following:

• fixes xref tags

• some tightening and removing of redundancy

• fixed some confusion in glabel section