Add more information to graphs
Work on error reporting