General updates and rendering changes