typos fixed and a TODO note added