Render refactor (with couple of fixes)

i don't know, should we?