Fix typo and add todo