Major cleanup, better make support for generating graphs
Fixed some graph parameters