director cleanup and minor fixes