added building proper cfgraph to several analyze-functions