Added unintentionally removed todo; Fixed typo