ExcelFileWriter update and small general changes. TableOfContent update.