A number of bug fixes, but graphs are still not being generated correctly