added DO parsing; improved expression Diag