Added a todo note
Fixed a typo
Fixed more typos