Fixed bugs from merge. Updated php graph.