fix typo, remove implemented TODOs