more fixing of path stuff mostly