Added new constructs to CFG construction, fixed a couple of bugs after testing construction against a large number of scripts