Fixed TODOs, reflowed text