changed pwd to actual DIR

fixed paths

final fixes

final fix