Added command directives. Among other things.