slight tweaks to directives and services