Fixed some typos, added some todo's.