Improved rendering and clipping