more graph codes and fix some locs