Changed graph logging, reactivated two state inv gen.