Lot's more rendering changes