clean up and fixed broken path