comments
fix typo and add exception