Render refactor (with couple of fixes)

Are these used for anything?