Updating some of the rendering code, other things