more directives + some copy changes