improved diag
added BundledCompoundStmt