-finished rewrite of solver graph generation, should fix bug related to PR #120