Improved label placement and handling infinite