Added directories and a few other little details to the executor code.