fix typo, finish todos