fix paths and logging