Updated comments, main and ODS.