Some work on improving handling of multiple spreadsheets/worksheets