Finalizing on "directives" and other minor changes