Fixed typo and TODO