Fixed minor typos
Updated TODO