fix typo, fix missing classes