More work on excel parsing