Some more work on supporting multiple spreadsheets
Minor