fixed paths once and for all
some merging