If/else parsing correction - working on nested if/else/while CFG hookups now