cleanup; cosmetics; add MET and prepare for VH discriminants