typo and TODO items