Changes for rendering and improved symbology.