add namespace/source commentary sections; get scope directives working