Render refactor (with couple of fixes)

hm, okay. it's doable