minor syntatic fixes
Update TODO