add some comments to avoid that someone breaks the MC with a 'trivial cleanup'
cosmetics in an error message