more rendering improvements