Minor tweak, added TODOs