clean up msg id support
fix typo