fix paths and names hopefully