some rendering improvements