Fix Typo and add TODO