#22 Some display improvement.