update volm_matcher and various fix