Some more work on Excel parsing