Fixed few minor typos

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