Render refactor (with couple of fixes)

I don't think this is necessary at all.