Fix the issue where we were dropping duplicate values.  Also improve the spreadsheet parsing.