Data_Dir now being passed correctly.  Path bugs fixed