scatterbrained improvements
more dir changes