Prevented excess handlers, corrected graphs.