fix wrong conversion in If statement, and add: IfSingle, While, DoWhile, Break, Continue, LabelledStmt