Advanced workbook consolidation and fixes