Added TODOs and refined Sections 1 to 3.