todo and typo fixed