Fixed up TODO roadmap