Small corrections and updates
Updated TODO.otl