cleanup and fixed CellRenderer for NULL values.