minor changes (added TODOs)