improve parsing
fix typo test