More rendering imrpovements