some improvements in G&C model generator