[IMP] usability and fix typo