Cleanup/do some todos

@stuartnelson3  I've picked you again. :smile: 

All these changes are supposed to be risk free. Basically, you need to check for typos and stupid mistakes.

Thanks.