Some of the directory issues fixed.