Render refactor (with couple of fixes)

Setting this to 1 effectively gets rid of the fix, right?