Better handling of empty cells and 'strange' input.