Change D3 directory place, + minors changes