Render refactor (with couple of fixes)

maybe i forgot to update it properly