Minor changes, added TODOs.