fix issue with baseline, better path setup