updated paths, cleanup