some graph + code updates