Added support for Basic Blocks in the control flow, plus fixed several problems with control flow graph generation