Remove TODOs and typo fix.