Graphs done, just some little upgrades needed