Minor revisions.
Further small updates required for initial integration.