added some more generators and graph stuff