Fixed bugs, added graphs :)