mostly updates to the directives, which now work in their entirety, as well as updates to the schema (and its schema)