Fixed few minor typos

Hope to see those TODOs filled in soon :)

Cheers!