Mark TODOs and modify some comments

Change-Id: I69f1da6283f9df88b10044e8d92f3c7f3b079cc1