add structure and fix typo