Graphs improved and other fixes