Isolated problems, added TODOs