Added some TODO and fixed some typos in comments