fix typo and dir issues