Changes to TODO, Windows files - from John Fay