Fixed and added more graphs