Jeremy, Nikesh | Minor edit and TO DO comments