expanding the Dir class & tweaks