Render refactor (with couple of fixes)

i guess they can be moved there (in their subpackage). i don't mind